From 7dfb0b734b67bb18ddbe131f85744986c2a73321 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 21 Nov 2008 08:21:28 +0000
Subject: [PATCH] Use a new gtk-doc feature to generate much nicer indices.

2008-11-21  Matthias Clasen  <mclasen@redhat.com>

        * gtk/Makefile.am:
        * gdk/Makefile.am:
        * gdk-pixbuf/Makefile.am: Use a new gtk-doc feature to generate
        much nicer indices.

        * gtk/drawing-model.xml: Fix document structure


svn path=/trunk/; revision=21795
---
 docs/reference/gdk-pixbuf/Makefile.am | 2 +-
 docs/reference/gdk/Makefile.am        | 2 +-
 docs/reference/gtk/Makefile.am        | 3 ++-
 docs/reference/gtk/drawing-model.xml  | 4 ++++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index f8cda83e61..3bf686d3ee 100644
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -47,7 +47,7 @@ GTKDOC_LIBS = \
 
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--main-sgml-file=$(DOC_MAIN_SGML_FILE) --sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib --output-format=xml
+MKDB_OPTIONS=--main-sgml-file=$(DOC_MAIN_SGML_FILE) --sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib --output-format=xml --name-space=gdk_pixbuf
 
 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files =				\
diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index 094557c1a8..28d7035e8d 100644
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -52,7 +52,7 @@ GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib)
 
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdk
 
 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files = 		\
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 3669707a85..af527eecb9 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -117,7 +117,7 @@ GTKDOC_LIBS = \
 
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gtk
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =					\
@@ -156,6 +156,7 @@ content_files =					\
 	visual_index.xml
 
 expand_content_files = 				\
+	drawing-model.xml			\
 	glossary.xml				\
 	migrating-checklist.sgml		\
 	migrating-GtkAction.sgml		\
diff --git a/docs/reference/gtk/drawing-model.xml b/docs/reference/gtk/drawing-model.xml
index 1da700480c..18f0ee7ae9 100644
--- a/docs/reference/gtk/drawing-model.xml
+++ b/docs/reference/gtk/drawing-model.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
 <chapter id="chap-drawing-model">
   <title>The GTK+ Drawing Model</title>
 
-- 
2.30.2